avoid redundant rpath entries on multiarch systems

 * src/build-system/configure(.ac): when ensuring that executables
   will be able to find libstdc++, don't add rpath entries that files
   under /etc/ld.so.conf.d already specify, even if they don't resemble
   traditional single-architecture or biarch locations.

Debian-Bug: 633567.
Author: Aaron M. Ucko <ucko@debian.org>
Last-Update: 2011-08-28

Gbp-Pq: Name no_multiarch_rpath

diff --git a/c++/src/build-system/configure b/c++/src/build-system/configure
index 4a45de55295f28e77b30fbba588a0a28a11a13a0..492675b4221ffca6e0925b462bd5f05ddc0255fa 100755 (executable)
--- a/c++/src/build-system/configure
+++ b/c++/src/build-system/configure
@@ -11052,7 +11052,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac

diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac
index 0e5fcd08118067dfac696714abfb1ec9d4917717..644498624f5a3f1a132deec2cb8efe99ad90af20 100644 (file)
--- a/c++/src/build-system/configure.ac
+++ b/c++/src/build-system/configure.ac
@@ -2537,7 +2537,7 @@ case "$compiler:$compiler_version:$with_bin_release:$ncbi_cv_prog_cxx_stdlib_lib
                break
                ;;
             /* )
-               found=true
+               fgrep -qsx $abs_dir /etc/ld.so.conf.d/*  ||  found=true
                break
                ;;
         esac